Revert 20437:64599a2d310d

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 804d18b45ef177ca17bc332872791b90d838ddc6..ba49261f0339e4cf45461f8c31e125e315a68e2a 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -64,11 +64,6 @@ static struct timer irq_ratelimit_timer;
 static unsigned int __read_mostly irq_ratelimit_threshold = 10000;
 integer_param("irq_ratelimit", irq_ratelimit_threshold);
 
-int check_irq_status(int irq)
-{
-    return irq_status[irq] != IRQ_UNUSED ? 1 : 0;
-}
-
 /* Must be called when irq disabled */
 void lock_vector_lock(void)
 {
@@ -721,9 +716,6 @@ int setup_irq(unsigned int irq, struct irqaction *new)
     desc->status &= ~IRQ_DISABLED;
     desc->handler->startup(irq);
 
-    if ( !check_irq_status(irq) )
-        irq_status[irq] = IRQ_USED;
-
     spin_unlock_irqrestore(&desc->lock,flags);
 
     return 0;
@@ -1412,8 +1404,6 @@ int map_domain_pirq(
 
     ASSERT(spin_is_locked(&pcidevs_lock));
     ASSERT(spin_is_locked(&d->event_lock));
-    
-    desc = irq_to_desc(irq);
 
     if ( !IS_PRIV(current->domain) &&
          !(IS_PRIV_FOR(current->domain, d) &&
@@ -1427,13 +1417,6 @@ int map_domain_pirq(
         return -EINVAL;
     }
 
-    if ( desc->action )
-    {
-        dprintk(XENLOG_G_WARNING, "Attempt to map in-use IRQ by Xen,"
-                        " irq:%d!\n", irq);
-        return 0;
-    }
-
     old_irq = domain_pirq_to_irq(d, pirq);
     old_pirq = domain_irq_to_pirq(d, irq);
 
@@ -1453,6 +1436,7 @@ int map_domain_pirq(
         return ret;
     }
 
+    desc = irq_to_desc(irq);
 
     if ( type == MAP_PIRQ_TYPE_MSI )
     {

diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index 3f6cc82f4b90d1841f545099dd8120449476e5f9..2d65fa4df435ab10e07139688d860be0de8ee34f 100644 (file)
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -30,7 +30,7 @@ ioapic_guest_write(
 static int physdev_map_pirq(struct physdev_map_pirq *map)
 {
     struct domain *d;
-    int pirq = 0, irq, ret = 0;
+    int pirq, irq, ret = 0;
     struct msi_info _msi;
     void *map_data = NULL;
 
@@ -55,28 +55,23 @@ static int physdev_map_pirq(struct physdev_map_pirq *map)
     switch ( map->type )
     {
         case MAP_PIRQ_TYPE_GSI:
-        {
-            int gsi, triggering, polarity;
-            
-            gsi = map->index & 0xffff;
-            triggering = !!(map->index & (1 << 16));
-            polarity = !!(map->index & (1 << 24));
-            irq = pirq = map->pirq;
-            
-            if ( gsi < 0 || gsi >= nr_irqs_gsi )
+            if ( map->index < 0 || map->index >= nr_irqs_gsi )
             {
-                dprintk(XENLOG_G_ERR, "dom%d: map invalid gsi %d\n",
-                        d->domain_id, gsi);
+                dprintk(XENLOG_G_ERR, "dom%d: map invalid irq %d\n",
+                        d->domain_id, map->index);
                 ret = -EINVAL;
                 goto free_domain;
             }
-            if ( !check_irq_status(irq) ) {
-                mp_register_gsi(gsi, triggering, polarity);
-                printk("Register gsi:%d for dom:%d, irq:%d\n", gsi,
-                      d->domain_id, irq);
+            irq = domain_pirq_to_irq(current->domain, map->index);
+            if ( !irq )
+            {
+                dprintk(XENLOG_G_ERR, "dom%d: map pirq with incorrect irq!\n",
+                        d->domain_id);
+                ret = -EINVAL;
+                goto free_domain;
             }
             break;
-        }
+
         case MAP_PIRQ_TYPE_MSI:
             irq = map->index;
             if ( irq == -1 )
@@ -108,6 +103,7 @@ static int physdev_map_pirq(struct physdev_map_pirq *map)
     spin_lock(&pcidevs_lock);
     /* Verify or get pirq. */
     spin_lock(&d->event_lock);
+    pirq = domain_irq_to_pirq(d, irq);
     if ( map->pirq < 0 )
     {
         if ( pirq )

diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index d080beef23408db7cf3e0b8099b5d010020ac73a..c10aafb59cceed9970767e09c5c1b3768abfd543 100644 (file)
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -143,8 +143,6 @@ void move_masked_irq(int irq);
 
 void irq_set_affinity(int irq, cpumask_t mask);
 
-int check_irq_status(int irq);
-
 #define domain_pirq_to_irq(d, pirq) ((d)->arch.pirq_irq[pirq])
 #define domain_irq_to_pirq(d, irq) ((d)->arch.irq_pirq[irq])